Dmitry Shachnev [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
Merge qtbase-opensource-src (5.15.2+dfsg-9) import into refs/heads/workingbranch
Helmut Grohne [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
call pkgconfig in order to be able to cross build qtbase with MySql.
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971604
Forwarded: not-needed
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
Qt's build system calls mysql_config... which won't work in a cross build
environment like Debian's, as it will throw an exec format error.
In order to solve this call pkgconfig and use mysqlclient.pc.
Gbp-Pq: Name cross_build_mysql.diff
Pino Toscano [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
Limit Linux-only code with Q_OS_LINUX
Forwarded: no
Last-Update: 2020-04-19
The QStorageInfo/QStorageIterator implementation used for Linux is used also
on Hurd, as it uses an interface provided by GNU libc.
QStorageIterator::device() tries to use PATH_MAX (unavailable on the Hurd)
to lookup a /dev/block/ path, which exists on Linux only; hence, perform that
check within a Q_OS_LINUX block.
Gbp-Pq: Name qstorageinfo_linux.diff
Pino Toscano [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
Avoid unconditional PATH_MAX usage
Forwarded: no
Last-Update: 2020-04-19
Use a "safe" size in case PATH_MAX is not defined; in the end, this should not
be used, as a allocating realpath() will be used instead.
Gbp-Pq: Name path_max.diff
Martin Smith [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
pass default include directories to qdoc
Bug: https://bugs.debian.org/908328
Forwarded: no
Last-Update: 2020-01-28
Gbp-Pq: Name qdoc_default_incdirs.diff
Dmitry Shachnev [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
guard UTIME_NOW/UTIME_OMIT usages
Forwarded: no
Last-Update: 2018-02-22
Gbp-Pq: Name nonlinux_utime.diff
Dmitry Shachnev [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
support ARMv4 architecture, needed for armel builds
Forwarded: no
Last-Update: 2016-07-01
Gbp-Pq: Name armv4.diff
Dmitry Shachnev [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
catch linker warnings in some config tests
Forwarded: https://codereview.qt-project.org/163214 (rejected)
Bug: https://bugs.debian.org/827935
Last-Update: 2019-03-02
Without this, qmake wrongly thinks that the tests succeed, for example:
./config.tests/unix/futimens/futimens.cpp:44: warning: futimens is not implemented and will always fail
test config.corelib.tests.futimens succeeded
Gbp-Pq: Name gnukfreebsd_linker_warnings.diff
Fathi Boudra [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
build ibase sql plugin against firebird
Forwarded: no
Last-Update: 2017-06-30
Gbp-Pq: Name link_fbclient.diff
Lisandro Damián Nicanor Pérez Meyer [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
remove non-used privacy-breach code
Forwarded: not-needed
Last-Update: 2015-02-18
This code makes Lintian unhappy. But we are really not using it, it only
gets inserted when building the online doc.
Anyways the best way to calm down Lintian is to simply remove it.
Gbp-Pq: Name remove_privacy_breaches.diff
Dmitry Shachnev [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
disable htmlinfo example which contains non-free files
Forwarded: not-needed
Last-Update: 2014-12-17
Gbp-Pq: Name no_htmlinfo_example.diff
Pino Toscano [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
Initial GNU/kFreeBSD support
Last-Update: 2015-06-03
Forwarded: no
- add a gnukfreebsd-g++ qmake mkspec, mostly copied from the hurd-g++ one
- properly use LD_LIBRARY_PATH on GNU/* systems
Gbp-Pq: Name gnukfreebsd.diff
Zhang Yu [Mon, 22 Feb 2021 01:25:01 +0000 (09:25 +0800)]
[PATCH] Fix invalid pointer return with QGridLayout::itemAt(-1)
QGridLayout::takeAt() and QLayoutItem *itemAt() only check the upper bound.
If the index < 0, these function will return invalid pointer.
Fixes: QTBUG-91261
Pick-to: 5.15 6.0 6.1
Change-Id: Idfb9fb6228b9707f817353b04974da16205a835c
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Gbp-Pq: Name fix-invalid-pointer-return-with-QGridLayout.diff
Debian Qt/KDE Maintainers [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
adjust QMimeDatabase implementation
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
0cbbba2aa5b47224
Last-Update: 2021-06-12
When multiple globs match, and the result from magic sniffing is
unrelated to any of those globs, globs have priority and one of them
should be picked up.
Gbp-Pq: Name mime_globs.diff
Debian Qt/KDE Maintainers [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
fix allocated memory of QByteArray returned by QIODevice::readLine
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
6485b6d45ad165cf
Last-Update: 2021-02-20
Gbp-Pq: Name qiodevice_readline_memory.diff
Debian Qt/KDE Maintainers [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
include <limits> to fix some GCC 11 build issues
Origin: upstream, commits:
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
813a928c7c3cf986
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
9c56d4da2ff631a8
Last-Update: 2021-01-26
Gbp-Pq: Name gcc_11_limits.diff
Debian Qt/KDE Maintainers [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
QNAM: work around QObject finicky orphan cleanup details
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
0807f16eb407eaf8
Last-Update: 2021-01-26
Gbp-Pq: Name qnam_connect_memory_leak.diff
Debian Qt/KDE Maintainers [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
Avoid use-after-free in QXcbConnection::initializeScreens()
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
86b8c5c3f32c2457
Last-Update: 2020-11-23
Gbp-Pq: Name xcb_screens_uaf.patch
Dmitry Shachnev [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
qtbase-opensource-src (5.15.2+dfsg-9) unstable; urgency=medium
* Revert adding fix-misplacement-of-placeholder-text-in-QLineEdit.diff.
Unfortunately it causes a regression (see QTBUG-94824).
[dgit import unpatched qtbase-opensource-src 5.15.2+dfsg-9]
Dmitry Shachnev [Fri, 2 Jul 2021 15:58:04 +0000 (16:58 +0100)]
Import qtbase-opensource-src_5.15.2+dfsg-9.debian.tar.xz
[dgit import tarball qtbase-opensource-src 5.15.2+dfsg-9 qtbase-opensource-src_5.15.2+dfsg-9.debian.tar.xz]
Lisandro Damián Nicanor Pérez Meyer [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
Merge qtbase-opensource-src (5.15.2+dfsg-7) import into refs/heads/workingbranch
Helmut Grohne [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
call pkgconfig in order to be able to cross build qtbase with MySql.
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971604
Forwarded: not-needed
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
Qt's build system calls mysql_config... which won't work in a cross build
environment like Debian's, as it will throw an exec format error.
In order to solve this call pkgconfig and use mysqlclient.pc.
Gbp-Pq: Name cross_build_mysql.diff
Pino Toscano [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
Limit Linux-only code with Q_OS_LINUX
Forwarded: no
Last-Update: 2020-04-19
The QStorageInfo/QStorageIterator implementation used for Linux is used also
on Hurd, as it uses an interface provided by GNU libc.
QStorageIterator::device() tries to use PATH_MAX (unavailable on the Hurd)
to lookup a /dev/block/ path, which exists on Linux only; hence, perform that
check within a Q_OS_LINUX block.
Gbp-Pq: Name qstorageinfo_linux.diff
Pino Toscano [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
Avoid unconditional PATH_MAX usage
Forwarded: no
Last-Update: 2020-04-19
Use a "safe" size in case PATH_MAX is not defined; in the end, this should not
be used, as a allocating realpath() will be used instead.
Gbp-Pq: Name path_max.diff
Martin Smith [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
pass default include directories to qdoc
Bug: https://bugs.debian.org/908328
Forwarded: no
Last-Update: 2020-01-28
Gbp-Pq: Name qdoc_default_incdirs.diff
Dmitry Shachnev [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
guard UTIME_NOW/UTIME_OMIT usages
Forwarded: no
Last-Update: 2018-02-22
Gbp-Pq: Name nonlinux_utime.diff
Dmitry Shachnev [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
support ARMv4 architecture, needed for armel builds
Forwarded: no
Last-Update: 2016-07-01
Gbp-Pq: Name armv4.diff
Dmitry Shachnev [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
catch linker warnings in some config tests
Forwarded: https://codereview.qt-project.org/163214 (rejected)
Bug: https://bugs.debian.org/827935
Last-Update: 2019-03-02
Without this, qmake wrongly thinks that the tests succeed, for example:
./config.tests/unix/futimens/futimens.cpp:44: warning: futimens is not implemented and will always fail
test config.corelib.tests.futimens succeeded
Gbp-Pq: Name gnukfreebsd_linker_warnings.diff
Fathi Boudra [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
build ibase sql plugin against firebird
Forwarded: no
Last-Update: 2017-06-30
Gbp-Pq: Name link_fbclient.diff
Lisandro Damián Nicanor Pérez Meyer [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
remove non-used privacy-breach code
Forwarded: not-needed
Last-Update: 2015-02-18
This code makes Lintian unhappy. But we are really not using it, it only
gets inserted when building the online doc.
Anyways the best way to calm down Lintian is to simply remove it.
Gbp-Pq: Name remove_privacy_breaches.diff
Dmitry Shachnev [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
disable htmlinfo example which contains non-free files
Forwarded: not-needed
Last-Update: 2014-12-17
Gbp-Pq: Name no_htmlinfo_example.diff
Pino Toscano [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
Initial GNU/kFreeBSD support
Last-Update: 2015-06-03
Forwarded: no
- add a gnukfreebsd-g++ qmake mkspec, mostly copied from the hurd-g++ one
- properly use LD_LIBRARY_PATH on GNU/* systems
Gbp-Pq: Name gnukfreebsd.diff
Zhang Yu [Mon, 22 Feb 2021 01:25:01 +0000 (09:25 +0800)]
[PATCH] Fix invalid pointer return with QGridLayout::itemAt(-1)
QGridLayout::takeAt() and QLayoutItem *itemAt() only check the upper bound.
If the index < 0, these function will return invalid pointer.
Fixes: QTBUG-91261
Pick-to: 5.15 6.0 6.1
Change-Id: Idfb9fb6228b9707f817353b04974da16205a835c
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Gbp-Pq: Name fix-invalid-pointer-return-with-QGridLayout.diff
Debian Qt/KDE Maintainers [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
adjust QMimeDatabase implementation
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
0cbbba2aa5b47224
Last-Update: 2021-05-18
When multiple globs match, and the result from magic sniffing is
unrelated to any of those globs, globs have priority and one of them
should be picked up.
This change also optimizes QMimeBinaryProvider::addFileNameMatches
to have the same logic as xdgmime for glob matching:
literals > extensions > other globs
As soon as one category matches, we can stop there.
This makes no difference in the overall results, in practice.
Gbp-Pq: Name mime_globs.diff
Debian Qt/KDE Maintainers [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
fix allocated memory of QByteArray returned by QIODevice::readLine
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
6485b6d45ad165cf
Last-Update: 2021-02-20
Gbp-Pq: Name qiodevice_readline_memory.diff
Debian Qt/KDE Maintainers [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
include <limits> to fix some GCC 11 build issues
Origin: upstream, commits:
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
813a928c7c3cf986
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
9c56d4da2ff631a8
Last-Update: 2021-01-26
Gbp-Pq: Name gcc_11_limits.diff
Debian Qt/KDE Maintainers [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
QNAM: work around QObject finicky orphan cleanup details
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
0807f16eb407eaf8
Last-Update: 2021-01-26
Gbp-Pq: Name qnam_connect_memory_leak.diff
Debian Qt/KDE Maintainers [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
Avoid use-after-free in QXcbConnection::initializeScreens()
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
86b8c5c3f32c2457
Last-Update: 2020-11-23
Gbp-Pq: Name xcb_screens_uaf.patch
Lisandro Damián Nicanor Pérez Meyer [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
qtbase-opensource-src (5.15.2+dfsg-7) unstable; urgency=medium
[ Lu Yaning ]
* Backport upstream patch to fix invalid pointer return with
QGridLayout::itemAt(-1): fix-invalid-pointer-return-with-QGridLayout.diff
[dgit import unpatched qtbase-opensource-src 5.15.2+dfsg-7]
Lisandro Damián Nicanor Pérez Meyer [Thu, 3 Jun 2021 12:55:29 +0000 (13:55 +0100)]
Import qtbase-opensource-src_5.15.2+dfsg-7.debian.tar.xz
[dgit import tarball qtbase-opensource-src 5.15.2+dfsg-7 qtbase-opensource-src_5.15.2+dfsg-7.debian.tar.xz]
Dmitry Shachnev [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
Merge qtbase-opensource-src (5.15.2+dfsg-5) import into refs/heads/workingbranch
Helmut Grohne [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
call pkgconfig in order to be able to cross build qtbase with MySql.
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971604
Forwarded: not-needed
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
Qt's build system calls mysql_config... which won't work in a cross build
environment like Debian's, as it will throw an exec format error.
In order to solve this call pkgconfig and use mysqlclient.pc.
Gbp-Pq: Name cross_build_mysql.diff
Pino Toscano [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
Limit Linux-only code with Q_OS_LINUX
Forwarded: no
Last-Update: 2020-04-19
The QStorageInfo/QStorageIterator implementation used for Linux is used also
on Hurd, as it uses an interface provided by GNU libc.
QStorageIterator::device() tries to use PATH_MAX (unavailable on the Hurd)
to lookup a /dev/block/ path, which exists on Linux only; hence, perform that
check within a Q_OS_LINUX block.
Gbp-Pq: Name qstorageinfo_linux.diff
Pino Toscano [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
Avoid unconditional PATH_MAX usage
Forwarded: no
Last-Update: 2020-04-19
Use a "safe" size in case PATH_MAX is not defined; in the end, this should not
be used, as a allocating realpath() will be used instead.
Gbp-Pq: Name path_max.diff
Martin Smith [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
pass default include directories to qdoc
Bug: https://bugs.debian.org/908328
Forwarded: no
Last-Update: 2020-01-28
Gbp-Pq: Name qdoc_default_incdirs.diff
Dmitry Shachnev [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
guard UTIME_NOW/UTIME_OMIT usages
Forwarded: no
Last-Update: 2018-02-22
Gbp-Pq: Name nonlinux_utime.diff
Dmitry Shachnev [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
support ARMv4 architecture, needed for armel builds
Forwarded: no
Last-Update: 2016-07-01
Gbp-Pq: Name armv4.diff
Dmitry Shachnev [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
catch linker warnings in some config tests
Forwarded: https://codereview.qt-project.org/163214 (rejected)
Bug: https://bugs.debian.org/827935
Last-Update: 2019-03-02
Without this, qmake wrongly thinks that the tests succeed, for example:
./config.tests/unix/futimens/futimens.cpp:44: warning: futimens is not implemented and will always fail
test config.corelib.tests.futimens succeeded
Gbp-Pq: Name gnukfreebsd_linker_warnings.diff
Fathi Boudra [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
build ibase sql plugin against firebird
Forwarded: no
Last-Update: 2017-06-30
Gbp-Pq: Name link_fbclient.diff
Lisandro Damián Nicanor Pérez Meyer [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
remove non-used privacy-breach code
Forwarded: not-needed
Last-Update: 2015-02-18
This code makes Lintian unhappy. But we are really not using it, it only
gets inserted when building the online doc.
Anyways the best way to calm down Lintian is to simply remove it.
Gbp-Pq: Name remove_privacy_breaches.diff
Dmitry Shachnev [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
disable htmlinfo example which contains non-free files
Forwarded: not-needed
Last-Update: 2014-12-17
Gbp-Pq: Name no_htmlinfo_example.diff
Pino Toscano [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
Initial GNU/kFreeBSD support
Last-Update: 2015-06-03
Forwarded: no
- add a gnukfreebsd-g++ qmake mkspec, mostly copied from the hurd-g++ one
- properly use LD_LIBRARY_PATH on GNU/* systems
Gbp-Pq: Name gnukfreebsd.diff
Debian Qt/KDE Maintainers [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
fix allocated memory of QByteArray returned by QIODevice::readLine
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
6485b6d45ad165cf
Last-Update: 2021-02-20
Gbp-Pq: Name qiodevice_readline_memory.diff
Debian Qt/KDE Maintainers [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
include <limits> to fix some GCC 11 build issues
Origin: upstream, commits:
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
813a928c7c3cf986
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
9c56d4da2ff631a8
Last-Update: 2021-01-26
Gbp-Pq: Name gcc_11_limits.diff
Debian Qt/KDE Maintainers [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
QNAM: work around QObject finicky orphan cleanup details
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
0807f16eb407eaf8
Last-Update: 2021-01-26
Gbp-Pq: Name qnam_connect_memory_leak.diff
Debian Qt/KDE Maintainers [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
Avoid use-after-free in QXcbConnection::initializeScreens()
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
86b8c5c3f32c2457
Last-Update: 2020-11-23
Gbp-Pq: Name xcb_screens_uaf.patch
Dmitry Shachnev [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
qtbase-opensource-src (5.15.2+dfsg-5) unstable; urgency=medium
* Backport upstream patch to fix allocated memory of QByteArray returned by
QIODevice::readLine (closes: #982882).
[dgit import unpatched qtbase-opensource-src 5.15.2+dfsg-5]
Dmitry Shachnev [Sun, 21 Feb 2021 17:00:31 +0000 (17:00 +0000)]
Import qtbase-opensource-src_5.15.2+dfsg-5.debian.tar.xz
[dgit import tarball qtbase-opensource-src 5.15.2+dfsg-5 qtbase-opensource-src_5.15.2+dfsg-5.debian.tar.xz]
Dmitry Shachnev [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
Merge qtbase-opensource-src (5.15.2+dfsg-4) import into refs/heads/workingbranch
Helmut Grohne [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
call pkgconfig in order to be able to cross build qtbase with MySql.
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971604
Forwarded: not-needed
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
Qt's build system calls mysql_config... which won't work in a cross build
environment like Debian's, as it will throw an exec format error.
In order to solve this call pkgconfig and use mysqlclient.pc.
Gbp-Pq: Name cross_build_mysql.diff
Pino Toscano [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
Limit Linux-only code with Q_OS_LINUX
Forwarded: no
Last-Update: 2020-04-19
The QStorageInfo/QStorageIterator implementation used for Linux is used also
on Hurd, as it uses an interface provided by GNU libc.
QStorageIterator::device() tries to use PATH_MAX (unavailable on the Hurd)
to lookup a /dev/block/ path, which exists on Linux only; hence, perform that
check within a Q_OS_LINUX block.
Gbp-Pq: Name qstorageinfo_linux.diff
Pino Toscano [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
Avoid unconditional PATH_MAX usage
Forwarded: no
Last-Update: 2020-04-19
Use a "safe" size in case PATH_MAX is not defined; in the end, this should not
be used, as a allocating realpath() will be used instead.
Gbp-Pq: Name path_max.diff
Martin Smith [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
pass default include directories to qdoc
Bug: https://bugs.debian.org/908328
Forwarded: no
Last-Update: 2020-01-28
Gbp-Pq: Name qdoc_default_incdirs.diff
Dmitry Shachnev [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
guard UTIME_NOW/UTIME_OMIT usages
Forwarded: no
Last-Update: 2018-02-22
Gbp-Pq: Name nonlinux_utime.diff
Dmitry Shachnev [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
support ARMv4 architecture, needed for armel builds
Forwarded: no
Last-Update: 2016-07-01
Gbp-Pq: Name armv4.diff
Dmitry Shachnev [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
catch linker warnings in some config tests
Forwarded: https://codereview.qt-project.org/163214 (rejected)
Bug: https://bugs.debian.org/827935
Last-Update: 2019-03-02
Without this, qmake wrongly thinks that the tests succeed, for example:
./config.tests/unix/futimens/futimens.cpp:44: warning: futimens is not implemented and will always fail
test config.corelib.tests.futimens succeeded
Gbp-Pq: Name gnukfreebsd_linker_warnings.diff
Fathi Boudra [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
build ibase sql plugin against firebird
Forwarded: no
Last-Update: 2017-06-30
Gbp-Pq: Name link_fbclient.diff
Lisandro Damián Nicanor Pérez Meyer [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
remove non-used privacy-breach code
Forwarded: not-needed
Last-Update: 2015-02-18
This code makes Lintian unhappy. But we are really not using it, it only
gets inserted when building the online doc.
Anyways the best way to calm down Lintian is to simply remove it.
Gbp-Pq: Name remove_privacy_breaches.diff
Dmitry Shachnev [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
disable htmlinfo example which contains non-free files
Forwarded: not-needed
Last-Update: 2014-12-17
Gbp-Pq: Name no_htmlinfo_example.diff
Pino Toscano [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
Initial GNU/kFreeBSD support
Last-Update: 2015-06-03
Forwarded: no
- add a gnukfreebsd-g++ qmake mkspec, mostly copied from the hurd-g++ one
- properly use LD_LIBRARY_PATH on GNU/* systems
Gbp-Pq: Name gnukfreebsd.diff
Debian Qt/KDE Maintainers [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
include <limits> to fix some GCC 11 build issues
Origin: upstream, commits:
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
813a928c7c3cf986
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
9c56d4da2ff631a8
Last-Update: 2021-01-26
Gbp-Pq: Name gcc_11_limits.diff
Debian Qt/KDE Maintainers [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
QNAM: work around QObject finicky orphan cleanup details
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
0807f16eb407eaf8
Last-Update: 2021-01-26
Gbp-Pq: Name qnam_connect_memory_leak.diff
Debian Qt/KDE Maintainers [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
Avoid use-after-free in QXcbConnection::initializeScreens()
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
86b8c5c3f32c2457
Last-Update: 2020-11-23
Gbp-Pq: Name xcb_screens_uaf.patch
Dmitry Shachnev [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
qtbase-opensource-src (5.15.2+dfsg-4) unstable; urgency=medium
* Add Conflicts: against the -gles packages, to make that relation mutual.
(Thanks to David Kalnischkies for the suggestion; see also #976389.)
[dgit import unpatched qtbase-opensource-src 5.15.2+dfsg-4]
Dmitry Shachnev [Mon, 1 Feb 2021 18:21:48 +0000 (18:21 +0000)]
Import qtbase-opensource-src_5.15.2+dfsg-4.debian.tar.xz
[dgit import tarball qtbase-opensource-src 5.15.2+dfsg-4 qtbase-opensource-src_5.15.2+dfsg-4.debian.tar.xz]
Dmitry Shachnev [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
Merge qtbase-opensource-src (5.15.2+dfsg-3) import into refs/heads/workingbranch
Helmut Grohne [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
call pkgconfig in order to be able to cross build qtbase with MySql.
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971604
Forwarded: not-needed
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
Qt's build system calls mysql_config... which won't work in a cross build
environment like Debian's, as it will throw an exec format error.
In order to solve this call pkgconfig and use mysqlclient.pc.
Gbp-Pq: Name cross_build_mysql.diff
Pino Toscano [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
Limit Linux-only code with Q_OS_LINUX
Forwarded: no
Last-Update: 2020-04-19
The QStorageInfo/QStorageIterator implementation used for Linux is used also
on Hurd, as it uses an interface provided by GNU libc.
QStorageIterator::device() tries to use PATH_MAX (unavailable on the Hurd)
to lookup a /dev/block/ path, which exists on Linux only; hence, perform that
check within a Q_OS_LINUX block.
Gbp-Pq: Name qstorageinfo_linux.diff
Pino Toscano [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
Avoid unconditional PATH_MAX usage
Forwarded: no
Last-Update: 2020-04-19
Use a "safe" size in case PATH_MAX is not defined; in the end, this should not
be used, as a allocating realpath() will be used instead.
Gbp-Pq: Name path_max.diff
Martin Smith [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
pass default include directories to qdoc
Bug: https://bugs.debian.org/908328
Forwarded: no
Last-Update: 2020-01-28
Gbp-Pq: Name qdoc_default_incdirs.diff
Dmitry Shachnev [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
guard UTIME_NOW/UTIME_OMIT usages
Forwarded: no
Last-Update: 2018-02-22
Gbp-Pq: Name nonlinux_utime.diff
Dmitry Shachnev [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
support ARMv4 architecture, needed for armel builds
Forwarded: no
Last-Update: 2016-07-01
Gbp-Pq: Name armv4.diff
Dmitry Shachnev [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
catch linker warnings in some config tests
Forwarded: https://codereview.qt-project.org/163214 (rejected)
Bug: https://bugs.debian.org/827935
Last-Update: 2019-03-02
Without this, qmake wrongly thinks that the tests succeed, for example:
./config.tests/unix/futimens/futimens.cpp:44: warning: futimens is not implemented and will always fail
test config.corelib.tests.futimens succeeded
Gbp-Pq: Name gnukfreebsd_linker_warnings.diff
Fathi Boudra [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
build ibase sql plugin against firebird
Forwarded: no
Last-Update: 2017-06-30
Gbp-Pq: Name link_fbclient.diff
Lisandro Damián Nicanor Pérez Meyer [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
remove non-used privacy-breach code
Forwarded: not-needed
Last-Update: 2015-02-18
This code makes Lintian unhappy. But we are really not using it, it only
gets inserted when building the online doc.
Anyways the best way to calm down Lintian is to simply remove it.
Gbp-Pq: Name remove_privacy_breaches.diff
Dmitry Shachnev [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
disable htmlinfo example which contains non-free files
Forwarded: not-needed
Last-Update: 2014-12-17
Gbp-Pq: Name no_htmlinfo_example.diff
Pino Toscano [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
Initial GNU/kFreeBSD support
Last-Update: 2015-06-03
Forwarded: no
- add a gnukfreebsd-g++ qmake mkspec, mostly copied from the hurd-g++ one
- properly use LD_LIBRARY_PATH on GNU/* systems
Gbp-Pq: Name gnukfreebsd.diff
Debian Qt/KDE Maintainers [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
include <limits> to fix some GCC 11 build issues
Origin: upstream, commits:
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
813a928c7c3cf986
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
9c56d4da2ff631a8
Last-Update: 2021-01-26
Gbp-Pq: Name gcc_11_limits.diff
Debian Qt/KDE Maintainers [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
QNAM: work around QObject finicky orphan cleanup details
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
0807f16eb407eaf8
Last-Update: 2021-01-26
Gbp-Pq: Name qnam_connect_memory_leak.diff
Debian Qt/KDE Maintainers [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
Avoid use-after-free in QXcbConnection::initializeScreens()
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=
86b8c5c3f32c2457
Last-Update: 2020-11-23
Gbp-Pq: Name xcb_screens_uaf.patch
Dmitry Shachnev [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
qtbase-opensource-src (5.15.2+dfsg-3) unstable; urgency=medium
* Backport upstream patch to fix memory leak in QNetworkAccessManager
from QMetaObjectPrivate::connect.
* Backport upstream changes to add #include <limits> for GCC 11.
* Update debian/watch: use format 4, and track only 5.15.x releases.
* Update debian/libqt5core5a.symbols for hurd-i386.
[dgit import unpatched qtbase-opensource-src 5.15.2+dfsg-3]
Dmitry Shachnev [Tue, 26 Jan 2021 17:17:11 +0000 (17:17 +0000)]
Import qtbase-opensource-src_5.15.2+dfsg-3.debian.tar.xz
[dgit import tarball qtbase-opensource-src 5.15.2+dfsg-3 qtbase-opensource-src_5.15.2+dfsg-3.debian.tar.xz]
Dmitry Shachnev [Fri, 11 Dec 2020 08:31:30 +0000 (08:31 +0000)]
Merge qtbase-opensource-src (5.15.2+dfsg-2) import into refs/heads/workingbranch
Helmut Grohne [Fri, 11 Dec 2020 08:31:30 +0000 (08:31 +0000)]
call pkgconfig in order to be able to cross build qtbase with MySql.
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971604
Forwarded: not-needed
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
Qt's build system calls mysql_config... which won't work in a cross build
environment like Debian's, as it will throw an exec format error.
In order to solve this call pkgconfig and use mysqlclient.pc.
Gbp-Pq: Name cross_build_mysql.diff
Pino Toscano [Fri, 11 Dec 2020 08:31:30 +0000 (08:31 +0000)]
Limit Linux-only code with Q_OS_LINUX
Forwarded: no
Last-Update: 2020-04-19
The QStorageInfo/QStorageIterator implementation used for Linux is used also
on Hurd, as it uses an interface provided by GNU libc.
QStorageIterator::device() tries to use PATH_MAX (unavailable on the Hurd)
to lookup a /dev/block/ path, which exists on Linux only; hence, perform that
check within a Q_OS_LINUX block.
Gbp-Pq: Name qstorageinfo_linux.diff
Pino Toscano [Fri, 11 Dec 2020 08:31:30 +0000 (08:31 +0000)]
Avoid unconditional PATH_MAX usage
Forwarded: no
Last-Update: 2020-04-19
Use a "safe" size in case PATH_MAX is not defined; in the end, this should not
be used, as a allocating realpath() will be used instead.
Gbp-Pq: Name path_max.diff
Martin Smith [Fri, 11 Dec 2020 08:31:30 +0000 (08:31 +0000)]
pass default include directories to qdoc
Bug: https://bugs.debian.org/908328
Forwarded: no
Last-Update: 2020-01-28
Gbp-Pq: Name qdoc_default_incdirs.diff
Dmitry Shachnev [Fri, 11 Dec 2020 08:31:30 +0000 (08:31 +0000)]
guard UTIME_NOW/UTIME_OMIT usages
Forwarded: no
Last-Update: 2018-02-22
Gbp-Pq: Name nonlinux_utime.diff
Dmitry Shachnev [Fri, 11 Dec 2020 08:31:30 +0000 (08:31 +0000)]
support ARMv4 architecture, needed for armel builds
Forwarded: no
Last-Update: 2016-07-01
Gbp-Pq: Name armv4.diff
Dmitry Shachnev [Fri, 11 Dec 2020 08:31:30 +0000 (08:31 +0000)]
catch linker warnings in some config tests
Forwarded: https://codereview.qt-project.org/163214 (rejected)
Bug: https://bugs.debian.org/827935
Last-Update: 2019-03-02
Without this, qmake wrongly thinks that the tests succeed, for example:
./config.tests/unix/futimens/futimens.cpp:44: warning: futimens is not implemented and will always fail
test config.corelib.tests.futimens succeeded
Gbp-Pq: Name gnukfreebsd_linker_warnings.diff